Refreshing patches.

diff --git a/debian/patches/gpsbabelfe-name b/debian/patches/gpsbabelfe-name
index 841bb093b225318f5136e7b4fa0e26dfa1fec5ec..5427adf62eb55777767e132eb9ab40f2975d73b8 100644 (file)
--- a/debian/patches/gpsbabelfe-name
+++ b/debian/patches/gpsbabelfe-name
@@ -1,10 +1,10 @@
 Rename gpsbabelfe binary.
---- a/gui/app.pro
-+++ b/gui/app.pro
-@@ -26,7 +26,7 @@ RESOURCES = app.qrc
- RC_FILE = app.rc
- 
- win32:TARGET=GPSBabelFE
+--- a/gpsbabel/gui/app.pro
++++ b/gpsbabel/gui/app.pro
+@@ -30,7 +30,7 @@ win32 {
+   TARGET=GPSBabelFE
+   QMAKE_LFLAGS_RELEASE += -static-libgcc
+ }
 -unix:TARGET=gpsbabelfe-bin
 +unix:TARGET=gpsbabelfe
  mac:TARGET=GPSBabelFE

diff --git a/debian/patches/gpsbabelfe_disable_version_check b/debian/patches/gpsbabelfe_disable_version_check
index b4bd1a9e2a7dc30aba716a8809e836b9d4817521..4f404300b9358a88230f30a9672bf2635860cb2a 100644 (file)
--- a/debian/patches/gpsbabelfe_disable_version_check
+++ b/debian/patches/gpsbabelfe_disable_version_check
@@ -1,7 +1,7 @@
 Disable version mismatch check.
 
---- a/gui/preferences.ui
-+++ b/gui/preferences.ui
+--- a/gpsbabel/gui/preferences.ui
++++ b/gpsbabel/gui/preferences.ui
 @@ -53,13 +53,6 @@
            </property>
           </widget>
@@ -16,15 +16,15 @@ Disable version mismatch check.
         </layout>
        </widget>
       </widget>
---- a/gui/preferences.cpp
-+++ b/gui/preferences.cpp
+--- a/gpsbabel/gui/preferences.cpp
++++ b/gpsbabel/gui/preferences.cpp
 @@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent
  
    ui_.startupCheck->setChecked(bd_.startupVersionCheck);
    ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics);
 -  ui_.ignoreVersionMismatchCheck->setChecked(bd_.ignoreVersionMismatch);
    // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
-   if (VERSION == "1.4.1") 
+   if (VERSION == QString("1.4.1"))
      bd_.ignoreVersionMismatch = false;
 @@ -84,7 +83,6 @@ void Preferences::acceptClicked()
  
@@ -34,8 +34,8 @@ Disable version mismatch check.
    accept();
  }
  
---- a/gui/babeldata.h
-+++ b/gui/babeldata.h
+--- a/gpsbabel/gui/babeldata.h
++++ b/gpsbabel/gui/babeldata.h
 @@ -66,7 +66,7 @@ public:
      startupVersionCheck(true),
      reportStatistics(true),

diff --git a/debian/patches/gpsbabelfe_do-not-check-for-newer-version b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
index a429fdf1fbab85e243e845184d0486977d5c0741..e363516bb6a91fb79c4d31c8ede4211b921e9205 100644 (file)
--- a/debian/patches/gpsbabelfe_do-not-check-for-newer-version
+++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version
@@ -1,7 +1,7 @@
 Disable check for newer versions on start.
 
---- a/gui/preferences.ui
-+++ b/gui/preferences.ui
+--- a/gpsbabel/gui/preferences.ui
++++ b/gpsbabel/gui/preferences.ui
 @@ -40,13 +40,6 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -16,8 +16,8 @@ Disable check for newer versions on start.
           <widget class="QCheckBox" name="reportStatisticsCheck">
            <property name="text">
             <string>Anonymously report usage data.</string>
---- a/gui/preferences.cpp
-+++ b/gui/preferences.cpp
+--- a/gpsbabel/gui/preferences.cpp
++++ b/gpsbabel/gui/preferences.cpp
 @@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent
  {
    ui_.setupUi(this);
@@ -25,7 +25,7 @@ Disable check for newer versions on start.
 -  ui_.startupCheck->setChecked(bd_.startupVersionCheck);
    ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics);
    // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
-   if (VERSION == "1.4.1") 
+   if (VERSION == QString("1.4.1"))
 @@ -81,7 +80,6 @@ void Preferences::acceptClicked()
      formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
    }
@@ -34,8 +34,8 @@ Disable check for newer versions on start.
    bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked();
    accept();
  }
---- a/gui/babeldata.h
-+++ b/gui/babeldata.h
+--- a/gpsbabel/gui/babeldata.h
++++ b/gpsbabel/gui/babeldata.h
 @@ -63,7 +63,7 @@ public:
      upgradeErrors(0),
      upgradeOffers(0),
@@ -45,8 +45,8 @@ Disable check for newer versions on start.
      reportStatistics(false),
      allowBetaUpgrades(false),
      ignoreVersionMismatch(true),
---- a/gui/mainwinui.ui
-+++ b/gui/mainwinui.ui
+--- a/gpsbabel/gui/mainwinui.ui
++++ b/gpsbabel/gui/mainwinui.ui
 @@ -641,7 +641,6 @@
      <addaction name="actionHelp"/>
      <addaction name="separator"/>
@@ -67,9 +67,9 @@ Disable check for newer versions on start.
    <action name="actionVisit_Website">
     <property name="text">
      <string>Visit Website...</string>
---- a/gui/mainwindow.cpp
-+++ b/gui/mainwindow.cpp
-@@ -153,7 +153,6 @@ MainWindow::MainWindow(QWidget* parent):
+--- a/gpsbabel/gui/mainwindow.cpp
++++ b/gpsbabel/gui/mainwindow.cpp
+@@ -162,7 +162,6 @@ MainWindow::MainWindow(QWidget* parent):
    connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
    connect(ui.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
    connect(ui.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
@@ -77,7 +77,7 @@ Disable check for newer versions on start.
    connect(ui.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
  
    connect(ui.inputFormatCombo,  SIGNAL(currentIndexChanged(int)),
-@@ -197,19 +196,8 @@ MainWindow::MainWindow(QWidget* parent):
+@@ -218,19 +217,8 @@ MainWindow::MainWindow(QWidget* parent):
  
    //--- Restore from registry
    restoreSettings();
@@ -97,7 +97,7 @@ Disable check for newer versions on start.
  }
  
  //------------------------------------------------------------------------
-@@ -926,10 +914,6 @@ void MainWindow::applyActionX()
+@@ -1060,10 +1048,6 @@ void MainWindow::applyActionX()
  //------------------------------------------------------------------------
  void MainWindow::closeActionX()
  {

diff --git a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
index 2d26f64aa1301601177e8dc55fbda432b4a508c8..f3c319b56f589d9259f0b45d926b94fb65628994 100644 (file)
--- a/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
+++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting
@@ -1,6 +1,6 @@
 Make statistics reporting an opt-in option.
---- a/gui/babeldata.h
-+++ b/gui/babeldata.h
+--- a/gpsbabel/gui/babeldata.h
++++ b/gpsbabel/gui/babeldata.h
 @@ -64,7 +64,7 @@ public:
      upgradeOffers(0),
      runCount(0),

diff --git a/debian/patches/htmldoc-location b/debian/patches/htmldoc-location
index bf2d596c92d916d8ff2bc9cb6c7ff0bed109c328..7588852325638257d2b4c8121c24247456e41482 100644 (file)
--- a/debian/patches/htmldoc-location
+++ b/debian/patches/htmldoc-location
@@ -1,20 +1,20 @@
---- a/gbversion.h.in
-+++ b/gbversion.h.in
+--- a/gpsbabel/gbversion.h.in
++++ b/gpsbabel/gbversion.h.in
 @@ -5,4 +5,4 @@
   * Isn't simplification via automation grand?
   */
  #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@"
 -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-@DOCVERSION@"
 +#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/htmldoc/index.html"
---- a/gui/help/gpsbabel.html
-+++ b/gui/help/gpsbabel.html
+--- a/gpsbabel/gui/help/gpsbabel.html
++++ b/gpsbabel/gui/help/gpsbabel.html
 @@ -1,3 +1,3 @@
  <p>This is the local help.  It currently isn't very helpful.</p>
 -<p>The <a href="http://www.gpsbabel.org/htmldoc-development"> online help 
 +<p>The <a href="file:///usr/share/doc/gpsbabel/htmldoc/index.html"> online help 
     is mo betta.</p>
---- a/xmldoc/gpsbabel_man.xml
-+++ b/xmldoc/gpsbabel_man.xml
+--- a/gpsbabel/xmldoc/gpsbabel_man.xml
++++ b/gpsbabel/xmldoc/gpsbabel_man.xml
 @@ -79,7 +79,7 @@ or as the backend for other tools. </par
        <listitem> <para>Display help that is more exhaustive than this page.  If <replaceable>format</replaceable> is given, provide help for only that format.</para> </listitem>
  </varlistentry>